win32: Clean up spinbutton themeing

diff --git a/gtk/gtk-win32-base.css b/gtk/gtk-win32-base.css
index 0b6cc914401e5f68dccd3726eac087bcd7fbc63e..7dd6e7e700fe7098a1806dc7720cd92875ea4985 100644 (file)
--- a/gtk/gtk-win32-base.css
+++ b/gtk/gtk-win32-base.css
@@ -347,54 +347,54 @@ GtkAssistant .sidebar .highlight {
 
 /* Spinbuttons */
 
-.spinbutton.button,
-.spinbutton.button:focused {
+.spinbutton .button,
+.spinbutton .button:focused {
     background-color: transparent;
-    border-width: 1px 1px 0 0;
-    border-style: none;
-    background-image: -gtk-win32-theme-part(spin, 1 1);
+    background-image: -gtk-win32-theme-part(spin, 1 1, margins(-1 -1 0 -1));
     color: rgba(0, 0, 0, 0);
 }
 
-.spinbutton.button:prelight,
-.spinbutton.button:prelight:focused {
-    background-image: -gtk-win32-theme-part(spin, 1 2);
-    color: rgba(0, 0, 0, 0);
+.spinbutton .button:last-child {
+    background-image: -gtk-win32-theme-part(spin, 1 1, margins(-1 -1 0 -2));
 }
 
-.spinbutton.button:active,
-.spinbutton.button:active:prelight {
-    background-image: -gtk-win32-theme-part(spin, 1 3);
-    color: rgba(0, 0, 0, 0);
+.spinbutton .button:prelight,
+.spinbutton .button:prelight:focused {
+    background-image: -gtk-win32-theme-part(spin, 1 2, margins(-1 -1 0 -1));
 }
 
-.spinbutton.button:insensitive {
-    background-image: -gtk-win32-theme-part(spin, 1 4);
-    color: rgba(0, 0, 0, 0);
+.spinbutton .button:active,
+.spinbutton .button:active:prelight,
+.spinbutton .button:active:focused,
+.spinbutton .button:active:prelight:focused {
+    background-image: -gtk-win32-theme-part(spin, 1 3, margins(-1 -1 0 -1));
+}
+
+.spinbutton .button:insensitive {
+    background-image: -gtk-win32-theme-part(spin, 1 4, margins(-1 -1 0 -1));
 }
 
-.spinbutton.button.bottom,
-.spinbutton.button.bottom:focused {
-    border-width: 0 1px 1px 0;
+.spinbutton .button:insensitive:last-child {
+    background-image: -gtk-win32-theme-part(spin, 1 4, margins(-1 -1 0 -2));
+}
+
+.spinbutton .button.bottom,
+.spinbutton .button.bottom:focused {
     background-image: -gtk-win32-theme-part(spin, 2 1);
-    color: rgba(0, 0, 0, 0);
 }
 
-.spinbutton.button.bottom:prelight,
-.spinbutton.button.bottom:prelight:focused {
+.spinbutton .button.bottom:prelight,
+.spinbutton .button.bottom:prelight:focused {
     background-image: -gtk-win32-theme-part(spin, 2 2);
-    color: rgba(0, 0, 0, 0);
 }
 
-.spinbutton.button.bottom:active,
-.spinbutton.button.bottom:active:prelight {
+.spinbutton .button.bottom:active,
+.spinbutton .button.bottom:active:prelight {
     background-image: -gtk-win32-theme-part(spin, 2 3);
-    color: rgba(0, 0, 0, 0);
 }
 
-.spinbutton.button.bottom:insensitive {
+.spinbutton .button.bottom:insensitive {
     background-image: -gtk-win32-theme-part(spin, 2 4);
-    color: rgba(0, 0, 0, 0);
 }
 
 /* Ranges */

diff --git a/gtk/gtk-win32-xp.css b/gtk/gtk-win32-xp.css
index f9c24ac675b49bd2c97fd8f20075fe009dfb33ff..a8ae0f8875da371db1b7b55312bf6bb234385859 100644 (file)
--- a/gtk/gtk-win32-xp.css
+++ b/gtk/gtk-win32-xp.css
@@ -36,3 +36,13 @@ GtkNotebook.notebook {
     background-image: none;
     border-width: 0;
 }
+
+.spinbutton .button {
+    border-width: 1px;
+    border-style: solid;
+    border-color: #7b9ebd;
+}
+
+.spinbutton .button:last-child {
+    border-width: 1px 1px 1px 0px;
+}